comment out debugging printing. remove memory_leak

2000-01-07  Jonathan Blandford  <jrb@redhat.com>

	* gdk-pixbuf/gdk-pixbuf-xform.c (gdk_pixbuf_rotate): comment out
	debugging printing.
	* gdk-pixbuf/io-gif.c (gif_get_lzw): remove memory_leak

diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog
index 5d525cce41b098b1df96a5434598fa4d9a177a50..beeafad2236197d6e4c8cef8d0452bd71c436ec0 100644 (file)
--- a/gdk-pixbuf/ChangeLog
+++ b/gdk-pixbuf/ChangeLog
@@ -1,5 +1,8 @@
 2000-01-07  Jonathan Blandford  <jrb@redhat.com>
 
+       * gdk-pixbuf/gdk-pixbuf-xform.c (gdk_pixbuf_rotate): comment out
+       debugging printing.
+
        * gdk-pixbuf/gdk-pixbuf-io.c: Added progressive animation loading.
        * gdk-pixbuf/gdk-pixbuf-io.h: Added progressive animation loading.
        * gdk-pixbuf/gdk-pixbuf-loader.c: Added progressive animation
@@ -9,6 +12,7 @@
        * gdk-pixbuf/io-gif.c (image_load_increment): I think the
        ref-counting mess is finally fixed.  Added progressive animation
        loading. 
+       (gif_get_lzw): remove memory_leak
 
        * doc/tmpl/gdk-pixbuf-loader.sgml: much longer long description
        added. 

diff --git a/gdk-pixbuf/gdk-pixbuf-xform.c b/gdk-pixbuf/gdk-pixbuf-xform.c
index 1e2eabe19658d7ca740c2128a11b857ffd248dd2..f118d9234aac44b3524730c997a5fae0e55e4e63 100644 (file)
--- a/gdk-pixbuf/gdk-pixbuf-xform.c
+++ b/gdk-pixbuf/gdk-pixbuf-xform.c
@@ -71,10 +71,10 @@ gdk_pixbuf_rotate (GdkPixbuf *pixbuf, gdouble angle)
        trans[5] = (double)h / 2.0;
 
        art_affine_multiply(affine, rot, trans);
-
+/*
        g_print("Affine: %e %e %e %e %e %e\n", affine[0], affine[1], affine[2],
                affine[3], affine[4], affine[5]);
-
+*/
        /* rowstride = w * pixbuf->art_pixbuf->n_channels; */
        rowstride = w * 3;
 

diff --git a/gdk-pixbuf/io-gif.c b/gdk-pixbuf/io-gif.c
index 1ba894dda681697e2ef8657eb079714cc1af2359..77ed21263ee99277b08373313138d0a064ba793f 100644 (file)
--- a/gdk-pixbuf/io-gif.c
+++ b/gdk-pixbuf/io-gif.c
@@ -821,10 +821,11 @@ gif_get_lzw (GifContext *context)
        }
 
        if (context->animation && context->state == GIF_GET_NEXT_STEP) {
-               (* context->frame_done_func) (context->frame,
-                                             context->user_data);
-
-               gdk_pixbuf_unref (context->pixbuf);
+               if (context->frame_done_func)
+                       (* context->frame_done_func) (context->frame,
+                                                     context->user_data);
+               if (context->frame_done_func)
+                       gdk_pixbuf_unref (context->pixbuf);
                context->pixbuf = NULL;
                context->frame = NULL;
        }